Call create-defualt-fontset, not

setup-default-fontset.  Call create-fontset-from-fontset-spec
within condition-case.

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index a5acf70301fc84ccac29d80677bd26b2f006837f..0786714c5388093ae7a7d4e7afbe9e4bd257a33a 100644 (file)
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -1179,9 +1179,14 @@ See the documentation of `create-fontset-from-fontset-spec for the format.")
 (if (fboundp 'new-fontset)
     (progn
       ;; Setup the default fontset.
-      (setup-default-fontset)
+      (create-default-fontset)
       ;; Create the standard fontset.
-      (create-fontset-from-fontset-spec ns-standard-fontset-spec t)))
+      (condition-case err
+         (create-fontset-from-fontset-spec ns-standard-fontset-spec t)
+       (error (display-warning 
+               'initialization
+               (format "Creation of the standard fontset failed: %s" err)
+               :error)))))
 
 ;;(push (cons 'font "-ns-*-*-*-*-*-10-*-*-*-*-*-fontset-standard")
 ;;      default-frame-alist)